from trunk
authorKenichi Handa <handa@m17n.org>
Mon, 8 Feb 2010 05:51:15 +0000 (14:51 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 8 Feb 2010 05:51:15 +0000 (14:51 +0900)

Trivial merge